Yarko/debug toolbar 1.0 fixes - completes changes for django-debug-toolbar 1.0.1#2225
Yarko/debug toolbar 1.0 fixes - completes changes for django-debug-toolbar 1.0.1#2225yarko wants to merge 1 commit intoopenedx:masterfrom
Conversation
|
when updating / merging my fork locally (mac/mavericks, git 1.8.5.3) file common/test/data/test_unicode/static/uni*.txt appeared as "untracked" - even though it was in the master / source repo... and is here... Not sure why this is here (I added it for my repo, since it is in the edx repo); |
|
So I rebased and squashed on my branch; not sure if there's something more I need to do here (my repo is showing this as one commit now); |
add trailing comma, restore uncommented state of Mongo panel
There was a problem hiding this comment.
Was this file added to the pull request by accident? It seems entirely unrelated.
There was a problem hiding this comment.
Ah sorry, just saw your comment above. I'm going to see if I can make a new PR that removes this.
There was a problem hiding this comment.
ugh!
I think this is a git bug, frankly...
It keeps happening to me, since I upgraded to git version 1.8.5.3
IT repeatedly thinks I "deleted this file from the repository" (I didn't);
I get stuck (can't push? don't remember where it sticks), so when
frustrated I just cry uncle "and add it back" - but it adds for a commit,
only on the next change to show as deleted from the repo again in git
status....
I'm happy to have you / someone just grab the pertinent changes and do
this, if you have a more functional git environ w.r.t. this test filename.
On Fri, Jan 31, 2014 at 12:02 PM, David Baumgold
notifications@github.comwrote:
In common/test/data/test_unicode/static/unicø∂é.txt:
@@ -0,0 +1,10 @@
+
+Upside down unicode text (http://www.sunnyneo.com/upsidedowntext.php?)
+
+˙ʇʇɐld uoɯəl plos əɥs ˙pəʌıl əuɹʎq ʎʇʇəq əɹəɥʍ pɐoɹ əɥʇ uʍop əɯɐɔ ʍoɔ-ooɯ əɥʇ
+˙ooʞɔnʇ ʎqɐq sɐʍ əɥ ˙əɔɐɟ ʎɹıɐɥ ɐ pɐɥ əɥ :ssɐlƃ ɐ ɥƃnoɹɥʇ ɯıɥ ʇɐ pəʞool ɹəɥʇɐɟ
+sıɥ :ʎɹoʇs ʇɐɥʇ ɯıɥ ploʇ ɹəɥʇɐɟ sıɥ
+
+˙˙˙ooʞɔnʇ ʎqɐq pəɯɐu ʎoq əlʇʇıl suəɔıu ɐ ʇəɯ pɐoɹ əɥʇ ƃuolɐ uʍop ƃuıɯoɔ sɐʍ ʇɐɥʇ
+ʍoɔ-ooɯ sıɥʇ puɐ pɐoɹ əɥʇ ƃuolɐ uʍop ƃuıɯoɔ ʍoɔ-ooɯ ɐ sɐʍ əɹəɥʇ sɐʍ ʇı əɯıʇ pooƃ
+ʎɹəʌ ɐ puɐ əɯıʇ ɐ uodn əɔuoWas this file added to the pull request by accident? It seems entirely
unrelated.—
Reply to this email directly or view it on GitHubhttps://github.com/edx/edx-platform/pull/2225/files#r9351019
.
There was a problem hiding this comment.
great - thanks.
On Fri, Jan 31, 2014 at 12:12 PM, David Baumgold
notifications@github.comwrote:
In common/test/data/test_unicode/static/unicø∂é.txt:
@@ -0,0 +1,10 @@
+
+Upside down unicode text (http://www.sunnyneo.com/upsidedowntext.php?)
+
+˙ʇʇɐld uoɯəl plos əɥs ˙pəʌıl əuɹʎq ʎʇʇəq əɹəɥʍ pɐoɹ əɥʇ uʍop əɯɐɔ ʍoɔ-ooɯ əɥʇ
+˙ooʞɔnʇ ʎqɐq sɐʍ əɥ ˙əɔɐɟ ʎɹıɐɥ ɐ pɐɥ əɥ :ssɐlƃ ɐ ɥƃnoɹɥʇ ɯıɥ ʇɐ pəʞool ɹəɥʇɐɟ
+sıɥ :ʎɹoʇs ʇɐɥʇ ɯıɥ ploʇ ɹəɥʇɐɟ sıɥ
+
+˙˙˙ooʞɔnʇ ʎqɐq pəɯɐu ʎoq əlʇʇıl suəɔıu ɐ ʇəɯ pɐoɹ əɥʇ ƃuolɐ uʍop ƃuıɯoɔ sɐʍ ʇɐɥʇ
+ʍoɔ-ooɯ sıɥʇ puɐ pɐoɹ əɥʇ ƃuolɐ uʍop ƃuıɯoɔ ʍoɔ-ooɯ ɐ sɐʍ əɹəɥʇ sɐʍ ʇı əɯıʇ pooƃ
+ʎɹəʌ ɐ puɐ əɯıʇ ɐ uodn əɔuoAh sorry, just saw your comment above. I'm going to see if I can make a
new PR that removes this.—
Reply to this email directly or view it on GitHubhttps://github.com/edx/edx-platform/pull/2225/files#r9351350
.
There was a problem hiding this comment.
Yeah, I was having some trouble with this as well, but eventually I was able to make a new commit to remove the file, and then squash those two commits together. I opened a new PR: #2391
2 participants
#2117 began changes, but left commented ProfilingDebugPanel in old form - this fixes;
#2208 added two files, but left out remaining files - this pull adds them;
Also, this pull corrects / adds trailing ',' at MongoDebugPanel in cms/envs/dev_dbperf.py,
In addition to #2208 & #2117, this also updates the 3 remaining files which needed updating.
Note - earlier today, I'd posted a patch (https://gist.github.com/yarko/8473409) of these files prior to #2208 being merged, and posted that patch on edx-code groups, to help people stuck there. Sometime today, #2215 was created, but with errors. Rather than comment on the errors in #2215, I've created this pull based on my work last night, merged with todays master.